libglnx porting: Port callers of gs_file_unlink to just unlink()

In the second case it's actually less code too.

Closes: #312
Approved by: giuseppe

diff --git a/src/libostree/ostree-repo.c b/src/libostree/ostree-repo.c
index f2538f5157cdd64a17f9ccd371679a57dfa8de27..1d0b2f9343dfa3c867d5c17679f13408e3ec76b5 100644 (file)
--- a/src/libostree/ostree-repo.c
+++ b/src/libostree/ostree-repo.c
@@ -1255,8 +1255,11 @@ impl_repo_remote_delete (OstreeRepo     *self,
 
   if (remote->file != NULL)
     {
-      if (!gs_file_unlink (remote->file, cancellable, error))
-        goto out;
+      if (unlink (gs_file_get_path_cached (remote->file)) != 0)
+        {
+          glnx_set_error_from_errno (error);
+          goto out;
+        }
     }
   else
     {

diff --git a/src/libotutil/ot-gio-utils.c b/src/libotutil/ot-gio-utils.c
index 103f6edde9d98134ec6445539e35981b1668bec4..6541a3215385a3a7f4e1d17482ffc69b95537fa5 100644 (file)
--- a/src/libotutil/ot-gio-utils.c
+++ b/src/libotutil/ot-gio-utils.c
@@ -390,25 +390,12 @@ ot_gfile_ensure_unlinked (GFile         *path,
                           GCancellable  *cancellable,
                           GError       **error)
 {
-  gboolean ret = FALSE;
-  GError *temp_error = NULL;
-
-  if (!gs_file_unlink (path, cancellable, &temp_error))
+  if (unlink (gs_file_get_path_cached (path)) != 0)
     {
-      if (g_error_matches (temp_error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND))
-        {
-          g_clear_error (&temp_error);
-        }
-      else
-        {
-          g_propagate_error (error, temp_error);
-          goto out;
-        }
+      if (errno != ENOENT)
+        return FALSE;
     }
-  
-  ret = TRUE;
- out:
-  return ret;
+  return TRUE;
 }
 
 /**